Skip to content

Conversation

Centril
Copy link
Contributor

@Centril Centril commented Jul 22, 2019

Successful merges:

Failed merges:

r? @ghost

nhynes and others added 30 commits July 16, 2019 02:34
Affect is usually used as a verb, effect as a verb.
…iper

Test that maplike FromIter satisfies uniqueness

This PR adds a simple assertion to the `HashMap` and `HashSet` tests to ensure that uniqueness is satisfied when `FromIter`ing. This is useful for people who want to test their custom type against the Map/Set interfaces since they'll copy the tests wholesale but possibly miss this bug (where _they_ = _me_).
Fix typo in src/libstd/net/udp.rs doc comment

Affect is usually used as a verb, effect as a verb.
…_compiler_messages_p9, r=Centril

normalize use of backticks in compiler messages for libcore/ptr

rust-lang#60532
use const array repeat expressions for uninit_array

With a first implementation of rust-lang#49147 having landed, we can make this macro nicer and phase it out with the next bootstrap bump.

However, to make this work, we have to mark `MaybeUninit::uninit()` as promotable. I do feel uneasy about promoting stuff involving uninitialized memory, but OTOH no *operation* on `MaybeUninit` is promotable, so maybe this is okay?

r? @oli-obk @eddyb
…_compiler_messages_p10, r=Centril

normalize use of backticks in compiler messages for librustc_lint

rust-lang#60532
…_compiler_messages_p11, r=GuillaumeGomez

normalize use of backticks in compiler messages for librustc_metadata

rust-lang#60532
…_compiler_messages_p12, r=Centril

normalize use of backticks in compiler messages for librustc_incremental

rust-lang#60532
read: fix doc comment

No idea how that happened...
…_compiler_messages_p13, r=Centril

normalize use of backticks in compiler messages for librustc/hir

rust-lang#60532
Centril added 3 commits July 22, 2019 15:32
…henkov

Fix typo in Unicode character name

There's a small typo in the Unicode character definitions: "Latin Epigraphic Letter Dideways" should be "Latin Epigraphic Letter Sideways I" (see [here](https://www.compart.com/en/unicode/U+A7F7)).
@Centril
Copy link
Contributor Author

Centril commented Jul 22, 2019

@bors r+ p=14 rollup=never

@bors
Copy link
Collaborator

bors commented Jul 22, 2019

📌 Commit 376382a has been approved by Centril

@bors bors added the S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. label Jul 22, 2019
@bors
Copy link
Collaborator

bors commented Jul 22, 2019

⌛ Testing commit 376382a with merge e649e90...

bors added a commit that referenced this pull request Jul 22, 2019
Rollup of 14 pull requests

Successful merges:

 - #62709 (Test that maplike FromIter satisfies uniqueness)
 - #62713 (Stabilize <*mut _>::cast and <*const _>::cast)
 - #62746 ( do not use assume_init in std::io)
 - #62787 (Fix typo in src/libstd/net/udp.rs doc comment)
 - #62788 (normalize use of backticks in compiler messages for libcore/ptr)
 - #62799 (use const array repeat expressions for uninit_array)
 - #62810 (normalize use of backticks in compiler messages for librustc_lint)
 - #62812 (normalize use of backticks in compiler messages for librustc_metadata)
 - #62832 (normalize use of backticks in compiler messages for librustc_incremental)
 - #62845 (read: fix doc comment)
 - #62853 (normalize use of backticks in compiler messages for librustc/hir)
 - #62854 (Fix typo in Unicode character name)
 - #62858 (Change wrong variable name.)
 - #62870 (fix lexing of comments with many \r)

Failed merges:

r? @ghost
@bors
Copy link
Collaborator

bors commented Jul 22, 2019

☀️ Test successful - checks-azure
Approved by: Centril
Pushing e649e90 to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Jul 22, 2019
@bors bors merged commit 376382a into rust-lang:master Jul 22, 2019
@Centril Centril deleted the rollup-ncnuelj branch July 22, 2019 20:54
@Centril Centril added the rollup A PR which is a rollup label Oct 2, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
merged-by-bors This PR was explicitly merged by bors. rollup A PR which is a rollup S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

9 participants